Merge with ppc/xen-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 2 Aug 2007 15:03:35 +0000 (16:03 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 2 Aug 2007 15:03:35 +0000 (16:03 +0100)

Trivial merge